Update to the latest libgsystem
authorColin Walters <walters@verbum.org>
Tue, 8 Jan 2013 12:04:29 +0000 (07:04 -0500)
committerColin Walters <walters@verbum.org>
Tue, 8 Jan 2013 12:04:29 +0000 (07:04 -0500)
src/libgsystem
src/ostree/ot-admin-builtin-update-kernel.c

index fe898ee93bdc8a625c460876c8b49428c8977219..ba7c19cd3b44902ba1dd9bb0fba43293b43abb0b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit fe898ee93bdc8a625c460876c8b49428c8977219
+Subproject commit ba7c19cd3b44902ba1dd9bb0fba43293b43abb0b
index c7f95b74d9c260934bf1e78351a6bbdb81b88e7b..6b398d96186097dc852429f010e090cf9e669856 100644 (file)
@@ -120,7 +120,8 @@ setup_kernel (OtAdminUpdateKernel *self,
   prefix = g_strndup (kernel_name, release - kernel_name);
   self->kernel_path = ot_gfile_get_child_strconcat (self->boot_ostree_dir, prefix, "-", self->release, NULL);
 
-  if (!gs_file_linkcopy_sync_data (src_kernel_path, self->kernel_path, cancellable, error))
+  if (!gs_file_linkcopy_sync_data (src_kernel_path, self->kernel_path, G_FILE_COPY_OVERWRITE,
+                                   cancellable, error))
     goto out;
 
   g_print ("ostadmin: Deploying kernel %s\n", gs_file_get_path_cached (self->kernel_path));
@@ -223,7 +224,8 @@ update_initramfs (OtAdminUpdateKernel  *self,
           goto out;
         }
 
-      if (!gs_file_linkcopy_sync_data (initramfs_tmp_file, initramfs_file, cancellable, error))
+      if (!gs_file_linkcopy_sync_data (initramfs_tmp_file, initramfs_file, G_FILE_COPY_OVERWRITE,
+                                       cancellable, error))
         goto out;
       
       /* In the fuse case, we need to chown after copying */